Skip to content

Issue 79 + 82 - #83

Closed
mgudapak wants to merge 6 commits into
biopython:masterfrom
mgudapak:issue-79
Closed

mgudapak wants to merge 6 commits into
biopython:masterfrom
mgudapak:issue-79

Conversation

@mgudapak

Copy link
Copy Markdown
Contributor

Summary of changes

P.S. - Sorry about clubbing fixes for two issues together in one pull request but they are closely related.

@peterjc

peterjc commented May 22, 2016

Copy link
Copy Markdown
Member

I've cherry-picked a couple of these suggestions, thank you.

Do you have strong views on line wrapping in the markdown files? I deliberately used hard line wrapping with pandoc to avoid overly long lines in the markdown where possible.

Are you comfortable with rebasing and force-pushing to a branch to update a pull request on GitHib?

@mgudapak

Copy link
Copy Markdown
Contributor Author

@peterjc - no strong views on line wrapping. I didn't realize it was intentional - they just wrapped odd as I was resizing my screen while working so I removed them. No worries at all on it.

I haven't done rebasing and force-pushing to a branch .. if you can teach me how or point me to something that does I'd be more than happy to.

thanks!

@peterjc

peterjc commented May 22, 2016

Copy link
Copy Markdown
Member

Good idea, I opened #84 on updating http://biopython.org/wiki/GitUsage

@peterjc

peterjc commented Jun 1, 2016

Copy link
Copy Markdown
Member

Basic idea for re-basing and updating this pull request:

$ git fetch origin
$ git checkout issue-79
$ git rebase origin/master
...

Bad case, you need to merge stuff. Here the abort option would be:

$ git rebase --abort

Then you should be back to where things were.

Good case, it just works (and this is what I would expect as I only cherry-picked a few of your changes so git should spot this and cope smoothly). In which case, assuming you named your fork https://github.com/mgudapak/biopython.github.io as mgudapack when you did git add remote ..., then:

$ git push mgudapack issue-79 --force

This is about the only time you should ever do a force-push! This will update the branch issue-79 on your github fork, i.e. https://github.com/mgudapak/biopython.github.io/tree/issue-79 - rewriting the original branch history. GitHub will automatically update this pull request since it is using this branch.

@mgudapak mgudapak closed this by deleting the head repository Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants